import type { GitActionProgressEvent, GitStackedAction, GitStatusResult, ThreadId,} from "@t3tools/contracts";import { useIsMutating, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";import { useCallback, useEffect, useEffectEvent, useMemo, useRef, useState } from "react";import { ChevronDownIcon, CloudUploadIcon, GitCommitIcon, InfoIcon } from "lucide-react";import { GitHubIcon } from "./Icons";import { buildGitActionProgressStages, buildMenuItems, type GitActionIconName, type GitActionMenuItem, type GitQuickAction, type DefaultBranchConfirmableAction, requiresDefaultBranchConfirmation, resolveDefaultBranchActionDialogCopy, resolveQuickAction, summarizeGitResult,} from "./GitActionsControl.logic";import { Button } from "~/components/ui/button";import { Checkbox } from "~/components/ui/checkbox";import { Dialog, DialogDescription, DialogFooter, DialogHeader, DialogPanel, DialogPopup, DialogTitle,} from "~/components/ui/dialog";import { Group, GroupSeparator } from "~/components/ui/group";import { Menu, MenuItem, MenuPopup, MenuTrigger } from "~/components/ui/menu";import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";import { ScrollArea } from "~/components/ui/scroll-area";import { Textarea } from "~/components/ui/textarea";import { toastManager } from "~/components/ui/toast";import { openInPreferredEditor } from "~/editorPreferences";import { gitBranchesQueryOptions, gitInitMutationOptions, gitMutationKeys, gitPullMutationOptions, gitRunStackedActionMutationOptions, gitStatusQueryOptions, invalidateGitQueries,} from "~/lib/gitReactQuery";import { randomUUID } from "~/lib/utils";import { resolvePathLinkTarget } from "~/terminal-links";import { readNativeApi } from "~/nativeApi"; interface GitActionsControlProps { gitCwd: string | null; activeThreadId: ThreadId | null;} interface PendingDefaultBranchAction { action: DefaultBranchConfirmableAction; branchName: string; includesCommit: boolean; commitMessage?: string; forcePushOnlyProgress: boolean; onConfirmed?: () => void; filePaths?: string[];} type GitActionToastId = ReturnType<typeof toastManager.add>; interface ActiveGitActionProgress { toastId: GitActionToastId; actionId: string; title: string; phaseStartedAtMs: number | null; hookStartedAtMs: number | null; hookName: string | null; lastOutputLine: string | null; currentPhaseLabel: string | null;} interface RunGitActionWithToastInput { action: GitStackedAction; commitMessage?: string; forcePushOnlyProgress?: boolean; onConfirmed?: () => void; skipDefaultBranchPrompt?: boolean; statusOverride?: GitStatusResult | null; featureBranch?: boolean; isDefaultBranchOverride?: boolean; progressToastId?: GitActionToastId; filePaths?: string[];} function formatElapsedDescription(startedAtMs: number | null): string | undefined { if (startedAtMs === null) { return undefined; } const elapsedSeconds = Math.max(0, Math.floor((Date.now() - startedAtMs) / 1000)); if (elapsedSeconds < 60) { return `Running for ${elapsedSeconds}s`; } const minutes = Math.floor(elapsedSeconds / 60); const seconds = elapsedSeconds % 60; return `Running for ${minutes}m ${seconds}s`;} function resolveProgressDescription(progress: ActiveGitActionProgress): string | undefined { if (progress.lastOutputLine) { return progress.lastOutputLine; } return formatElapsedDescription(progress.hookStartedAtMs ?? progress.phaseStartedAtMs);} function getMenuActionDisabledReason({ item, gitStatus, isBusy, hasOriginRemote,}: { item: GitActionMenuItem; gitStatus: GitStatusResult | null; isBusy: boolean; hasOriginRemote: boolean;}): string | null { if (!item.disabled) return null; if (isBusy) return "Git action in progress."; if (!gitStatus) return "Git status is unavailable."; const hasBranch = gitStatus.branch !== null; const hasChanges = gitStatus.hasWorkingTreeChanges; const hasOpenPr = gitStatus.pr?.state === "open"; const isAhead = gitStatus.aheadCount > 0; const isBehind = gitStatus.behindCount > 0; if (item.id === "commit") { if (!hasChanges) { return "Worktree is clean. Make changes before committing."; } return "Commit is currently unavailable."; } if (item.id === "push") { if (!hasBranch) { return "Detached HEAD: checkout a branch before pushing."; } if (hasChanges) { return "Commit or stash local changes before pushing."; } if (isBehind) { return "Branch is behind upstream. Pull/rebase before pushing."; } if (!gitStatus.hasUpstream && !hasOriginRemote) { return 'Add an "origin" remote before pushing.'; } if (!isAhead) { return "No local commits to push."; } return "Push is currently unavailable."; } if (hasOpenPr) { return "View PR is currently unavailable."; } if (!hasBranch) { return "Detached HEAD: checkout a branch before creating a PR."; } if (hasChanges) { return "Commit local changes before creating a PR."; } if (!gitStatus.hasUpstream && !hasOriginRemote) { return 'Add an "origin" remote before creating a PR.'; } if (!isAhead) { return "No local commits to include in a PR."; } if (isBehind) { return "Branch is behind upstream. Pull/rebase before creating a PR."; } return "Create PR is currently unavailable.";} const COMMIT_DIALOG_TITLE = "Commit changes";const COMMIT_DIALOG_DESCRIPTION = "Review and confirm your commit. Leave the message blank to auto-generate one."; function GitActionItemIcon({ icon }: { icon: GitActionIconName }) { if (icon === "commit") return <GitCommitIcon />; if (icon === "push") return <CloudUploadIcon />; return <GitHubIcon />;} function GitQuickActionIcon({ quickAction }: { quickAction: GitQuickAction }) { const iconClassName = "size-3.5"; if (quickAction.kind === "open_pr") return <GitHubIcon className={iconClassName} />; if (quickAction.kind === "run_pull") return <InfoIcon className={iconClassName} />; if (quickAction.kind === "run_action") { if (quickAction.action === "commit") return <GitCommitIcon className={iconClassName} />; if (quickAction.action === "commit_push") return <CloudUploadIcon className={iconClassName} />; return <GitHubIcon className={iconClassName} />; } if (quickAction.label === "Commit") return <GitCommitIcon className={iconClassName} />; return <InfoIcon className={iconClassName} />;} export default function GitActionsControl({ gitCwd, activeThreadId }: GitActionsControlProps) { const threadToastData = useMemo( () => (activeThreadId ? { threadId: activeThreadId } : undefined), [activeThreadId], ); const queryClient = useQueryClient(); const [isCommitDialogOpen, setIsCommitDialogOpen] = useState(false); const [dialogCommitMessage, setDialogCommitMessage] = useState(""); const [excludedFiles, setExcludedFiles] = useState<ReadonlySet<string>>(new Set()); const [isEditingFiles, setIsEditingFiles] = useState(false); const [pendingDefaultBranchAction, setPendingDefaultBranchAction] = useState<PendingDefaultBranchAction | null>(null); const activeGitActionProgressRef = useRef<ActiveGitActionProgress | null>(null); const updateActiveProgressToast = useCallback(() => { const progress = activeGitActionProgressRef.current; if (!progress) { return; } toastManager.update(progress.toastId, { type: "loading", title: progress.title, description: resolveProgressDescription(progress), timeout: 0, data: threadToastData, }); }, [threadToastData]); const { data: gitStatus = null, error: gitStatusError } = useQuery(gitStatusQueryOptions(gitCwd)); const { data: branchList = null } = useQuery(gitBranchesQueryOptions(gitCwd)); // Default to true while loading so we don't flash init controls. const isRepo = branchList?.isRepo ?? true; const hasOriginRemote = branchList?.hasOriginRemote ?? false; const currentBranch = branchList?.branches.find((branch) => branch.current)?.name ?? null; const isGitStatusOutOfSync = !!gitStatus?.branch && !!currentBranch && gitStatus.branch !== currentBranch; useEffect(() => { if (!isGitStatusOutOfSync) return; void invalidateGitQueries(queryClient); }, [isGitStatusOutOfSync, queryClient]); const gitStatusForActions = isGitStatusOutOfSync ? null : gitStatus; const allFiles = gitStatusForActions?.workingTree.files ?? []; const selectedFiles = allFiles.filter((f) => !excludedFiles.has(f.path)); const allSelected = excludedFiles.size === 0; const noneSelected = selectedFiles.length === 0; const initMutation = useMutation(gitInitMutationOptions({ cwd: gitCwd, queryClient })); const runImmediateGitActionMutation = useMutation( gitRunStackedActionMutationOptions({ cwd: gitCwd, queryClient, }), ); const pullMutation = useMutation(gitPullMutationOptions({ cwd: gitCwd, queryClient })); const isRunStackedActionRunning = useIsMutating({ mutationKey: gitMutationKeys.runStackedAction(gitCwd) }) > 0; const isPullRunning = useIsMutating({ mutationKey: gitMutationKeys.pull(gitCwd) }) > 0; const isGitActionRunning = isRunStackedActionRunning || isPullRunning; const isDefaultBranch = useMemo(() => { const branchName = gitStatusForActions?.branch; if (!branchName) return false; const current = branchList?.branches.find((branch) => branch.name === branchName); return current?.isDefault ?? (branchName === "main" || branchName === "master"); }, [branchList?.branches, gitStatusForActions?.branch]); const gitActionMenuItems = useMemo( () => buildMenuItems(gitStatusForActions, isGitActionRunning, hasOriginRemote), [gitStatusForActions, hasOriginRemote, isGitActionRunning], ); const quickAction = useMemo( () => resolveQuickAction(gitStatusForActions, isGitActionRunning, isDefaultBranch, hasOriginRemote), [gitStatusForActions, hasOriginRemote, isDefaultBranch, isGitActionRunning], ); const quickActionDisabledReason = quickAction.disabled ? (quickAction.hint ?? "This action is currently unavailable.") : null; const pendingDefaultBranchActionCopy = pendingDefaultBranchAction ? resolveDefaultBranchActionDialogCopy({ action: pendingDefaultBranchAction.action, branchName: pendingDefaultBranchAction.branchName, includesCommit: pendingDefaultBranchAction.includesCommit, }) : null; useEffect(() => { const api = readNativeApi(); if (!api) { return; } const applyProgressEvent = (event: GitActionProgressEvent) => { const progress = activeGitActionProgressRef.current; if (!progress) { return; } if (gitCwd && event.cwd !== gitCwd) { return; } if (progress.actionId !== event.actionId) { return; } const now = Date.now(); switch (event.kind) { case "action_started": progress.phaseStartedAtMs = now; progress.hookStartedAtMs = null; progress.hookName = null; progress.lastOutputLine = null; break; case "phase_started": progress.title = event.label; progress.currentPhaseLabel = event.label; progress.phaseStartedAtMs = now; progress.hookStartedAtMs = null; progress.hookName = null; progress.lastOutputLine = null; break; case "hook_started": progress.title = `Running ${event.hookName}...`; progress.hookName = event.hookName; progress.hookStartedAtMs = now; progress.lastOutputLine = null; break; case "hook_output": progress.lastOutputLine = event.text; break; case "hook_finished": progress.title = progress.currentPhaseLabel ?? "Committing..."; progress.hookName = null; progress.hookStartedAtMs = null; progress.lastOutputLine = null; break; case "action_finished": // Don't clear timestamps here — the HTTP response handler (line 496) // sets activeGitActionProgressRef to null and shows the success toast. // Clearing timestamps early causes the "Running for Xs" description // to disappear before the success state renders, leaving a bare // "Pushing..." toast in the gap between the WS event and HTTP response. return; case "action_failed": // Same reasoning as action_finished — let the HTTP error handler // manage the final toast state to avoid a flash of bare title. return; } updateActiveProgressToast(); }; return api.git.onActionProgress(applyProgressEvent); }, [gitCwd, updateActiveProgressToast]); useEffect(() => { const interval = window.setInterval(() => { if (!activeGitActionProgressRef.current) { return; } updateActiveProgressToast(); }, 1000); return () => { window.clearInterval(interval); }; }, [updateActiveProgressToast]); const openExistingPr = useCallback(async () => { const api = readNativeApi(); if (!api) { toastManager.add({ type: "error", title: "Link opening is unavailable.", data: threadToastData, }); return; } const prUrl = gitStatusForActions?.pr?.state === "open" ? gitStatusForActions.pr.url : null; if (!prUrl) { toastManager.add({ type: "error", title: "No open PR found.", data: threadToastData, }); return; } void api.shell.openExternal(prUrl).catch((err) => { toastManager.add({ type: "error", title: "Unable to open PR link", description: err instanceof Error ? err.message : "An error occurred.", data: threadToastData, }); }); }, [gitStatusForActions, threadToastData]); const runGitActionWithToast = useEffectEvent( async ({ action, commitMessage, forcePushOnlyProgress = false, onConfirmed, skipDefaultBranchPrompt = false, statusOverride, featureBranch = false, isDefaultBranchOverride, progressToastId, filePaths, }: RunGitActionWithToastInput) => { const actionStatus = statusOverride ?? gitStatusForActions; const actionBranch = actionStatus?.branch ?? null; const actionIsDefaultBranch = isDefaultBranchOverride ?? (featureBranch ? false : isDefaultBranch); const includesCommit = !forcePushOnlyProgress && (action === "commit" || !!actionStatus?.hasWorkingTreeChanges); if ( !skipDefaultBranchPrompt && requiresDefaultBranchConfirmation(action, actionIsDefaultBranch) && actionBranch ) { if (action !== "commit_push" && action !== "commit_push_pr") { return; } setPendingDefaultBranchAction({ action, branchName: actionBranch, includesCommit, ...(commitMessage ? { commitMessage } : {}), forcePushOnlyProgress, ...(onConfirmed ? { onConfirmed } : {}), ...(filePaths ? { filePaths } : {}), }); return; } onConfirmed?.(); const progressStages = buildGitActionProgressStages({ action, hasCustomCommitMessage: !!commitMessage?.trim(), hasWorkingTreeChanges: !!actionStatus?.hasWorkingTreeChanges, forcePushOnly: forcePushOnlyProgress, featureBranch, }); const actionId = randomUUID(); const resolvedProgressToastId = progressToastId ?? toastManager.add({ type: "loading", title: progressStages[0] ?? "Running git action...", description: "Waiting for Git...", timeout: 0, data: threadToastData, }); activeGitActionProgressRef.current = { toastId: resolvedProgressToastId, actionId, title: progressStages[0] ?? "Running git action...", phaseStartedAtMs: null, hookStartedAtMs: null, hookName: null, lastOutputLine: null, currentPhaseLabel: progressStages[0] ?? "Running git action...", }; if (progressToastId) { toastManager.update(progressToastId, { type: "loading", title: progressStages[0] ?? "Running git action...", description: "Waiting for Git...", timeout: 0, data: threadToastData, }); } const promise = runImmediateGitActionMutation.mutateAsync({ actionId, action, ...(commitMessage ? { commitMessage } : {}), ...(featureBranch ? { featureBranch } : {}), ...(filePaths ? { filePaths } : {}), }); try { const result = await promise; activeGitActionProgressRef.current = null; const resultToast = summarizeGitResult(result); const existingOpenPrUrl = actionStatus?.pr?.state === "open" ? actionStatus.pr.url : undefined;Lines 1–500 of 1066. Load more
import type { GitActionProgressEvent, GitStackedAction, GitStatusResult, ThreadId, } from "@t3tools/contracts"; import { useIsMutating, useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; import { useCallback, useEffect, useEffectEvent, useMemo, useRef, useState } from "react"; import { ChevronDownIcon, CloudUploadIcon, GitCommitIcon, InfoIcon } from "lucide-react"; import { GitHubIcon } from "./Icons"; import { buildGitActionProgressStages, buildMenuItems, type GitActionIconName, type GitActionMenuItem, type GitQuickAction, type DefaultBranchConfirmableAction, requiresDefaultBranchConfirmation, resolveDefaultBranchActionDialogCopy, resolveQuickAction, summarizeGitResult, } from "./GitActionsControl.logic"; import { Button } from "~/components/ui/button"; import { Checkbox } from "~/components/ui/checkbox"; import { Dialog, DialogDescription, DialogFooter, DialogHeader, DialogPanel, DialogPopup, DialogTitle, } from "~/components/ui/dialog"; import { Group, GroupSeparator } from "~/components/ui/group"; import { Menu, MenuItem, MenuPopup, MenuTrigger } from "~/components/ui/menu"; import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover"; import { ScrollArea } from "~/components/ui/scroll-area"; import { Textarea } from "~/components/ui/textarea"; import { toastManager } from "~/components/ui/toast"; import { openInPreferredEditor } from "~/editorPreferences"; import { gitBranchesQueryOptions, gitInitMutationOptions, gitMutationKeys, gitPullMutationOptions, gitRunStackedActionMutationOptions, gitStatusQueryOptions, invalidateGitQueries, } from "~/lib/gitReactQuery"; import { randomUUID } from "~/lib/utils"; import { resolvePathLinkTarget } from "~/terminal-links"; import { readNativeApi } from "~/nativeApi"; interface GitActionsControlProps { gitCwd: string | null; activeThreadId: ThreadId | null; } interface PendingDefaultBranchAction { action: DefaultBranchConfirmableAction; branchName: string; includesCommit: boolean; commitMessage?: string; forcePushOnlyProgress: boolean; onConfirmed?: () => void; filePaths?: string[]; } type GitActionToastId = ReturnType<typeof toastManager.add>; interface ActiveGitActionProgress { toastId: GitActionToastId; actionId: string; title: string; phaseStartedAtMs: number | null; hookStartedAtMs: number | null; hookName: string | null; lastOutputLine: string | null; currentPhaseLabel: string | null; } interface RunGitActionWithToastInput { action: GitStackedAction; commitMessage?: string; forcePushOnlyProgress?: boolean; onConfirmed?: () => void; skipDefaultBranchPrompt?: boolean; statusOverride?: GitStatusResult | null; featureBranch?: boolean; isDefaultBranchOverride?: boolean; progressToastId?: GitActionToastId; filePaths?: string[]; } function formatElapsedDescription(startedAtMs: number | null): string | undefined { if (startedAtMs === null) { return undefined; } const elapsedSeconds = Math.max(0, Math.floor((Date.now() - startedAtMs) / 1000)); if (elapsedSeconds < 60) { return `Running for ${elapsedSeconds}s`; } const minutes = Math.floor(elapsedSeconds / 60); const seconds = elapsedSeconds % 60; return `Running for ${minutes}m ${seconds}s`; } function resolveProgressDescription(progress: ActiveGitActionProgress): string | undefined { if (progress.lastOutputLine) { return progress.lastOutputLine; } return formatElapsedDescription(progress.hookStartedAtMs ?? progress.phaseStartedAtMs); } function getMenuActionDisabledReason({ item, gitStatus, isBusy, hasOriginRemote, }: { item: GitActionMenuItem; gitStatus: GitStatusResult | null; isBusy: boolean; hasOriginRemote: boolean; }): string | null { if (!item.disabled) return null; if (isBusy) return "Git action in progress."; if (!gitStatus) return "Git status is unavailable."; const hasBranch = gitStatus.branch !== null; const hasChanges = gitStatus.hasWorkingTreeChanges; const hasOpenPr = gitStatus.pr?.state === "open"; const isAhead = gitStatus.aheadCount > 0; const isBehind = gitStatus.behindCount > 0; if (item.id === "commit") { if (!hasChanges) { return "Worktree is clean. Make changes before committing."; } return "Commit is currently unavailable."; } if (item.id === "push") { if (!hasBranch) { return "Detached HEAD: checkout a branch before pushing."; } if (hasChanges) { return "Commit or stash local changes before pushing."; } if (isBehind) { return "Branch is behind upstream. Pull/rebase before pushing."; } if (!gitStatus.hasUpstream && !hasOriginRemote) { return 'Add an "origin" remote before pushing.'; } if (!isAhead) { return "No local commits to push."; } return "Push is currently unavailable."; } if (hasOpenPr) { return "View PR is currently unavailable."; } if (!hasBranch) { return "Detached HEAD: checkout a branch before creating a PR."; } if (hasChanges) { return "Commit local changes before creating a PR."; } if (!gitStatus.hasUpstream && !hasOriginRemote) { return 'Add an "origin" remote before creating a PR.'; } if (!isAhead) { return "No local commits to include in a PR."; } if (isBehind) { return "Branch is behind upstream. Pull/rebase before creating a PR."; } return "Create PR is currently unavailable."; } const COMMIT_DIALOG_TITLE = "Commit changes"; const COMMIT_DIALOG_DESCRIPTION = "Review and confirm your commit. Leave the message blank to auto-generate one."; function GitActionItemIcon({ icon }: { icon: GitActionIconName }) { if (icon === "commit") return <GitCommitIcon />; if (icon === "push") return <CloudUploadIcon />; return <GitHubIcon />; } function GitQuickActionIcon({ quickAction }: { quickAction: GitQuickAction }) { const iconClassName = "size-3.5"; if (quickAction.kind === "open_pr") return <GitHubIcon className={iconClassName} />; if (quickAction.kind === "run_pull") return <InfoIcon className={iconClassName} />; if (quickAction.kind === "run_action") { if (quickAction.action === "commit") return <GitCommitIcon className={iconClassName} />; if (quickAction.action === "commit_push") return <CloudUploadIcon className={iconClassName} />; return <GitHubIcon className={iconClassName} />; } if (quickAction.label === "Commit") return <GitCommitIcon className={iconClassName} />; return <InfoIcon className={iconClassName} />; } export default function GitActionsControl({ gitCwd, activeThreadId }: GitActionsControlProps) { const threadToastData = useMemo( () => (activeThreadId ? { threadId: activeThreadId } : undefined), [activeThreadId], ); const queryClient = useQueryClient(); const [isCommitDialogOpen, setIsCommitDialogOpen] = useState(false); const [dialogCommitMessage, setDialogCommitMessage] = useState(""); const [excludedFiles, setExcludedFiles] = useState<ReadonlySet<string>>(new Set()); const [isEditingFiles, setIsEditingFiles] = useState(false); const [pendingDefaultBranchAction, setPendingDefaultBranchAction] = useState<PendingDefaultBranchAction | null>(null); const activeGitActionProgressRef = useRef<ActiveGitActionProgress | null>(null); const updateActiveProgressToast = useCallback(() => { const progress = activeGitActionProgressRef.current; if (!progress) { return; } toastManager.update(progress.toastId, { type: "loading", title: progress.title, description: resolveProgressDescription(progress), timeout: 0, data: threadToastData, }); }, [threadToastData]); const { data: gitStatus = null, error: gitStatusError } = useQuery(gitStatusQueryOptions(gitCwd)); const { data: branchList = null } = useQuery(gitBranchesQueryOptions(gitCwd)); // Default to true while loading so we don't flash init controls. const isRepo = branchList?.isRepo ?? true; const hasOriginRemote = branchList?.hasOriginRemote ?? false; const currentBranch = branchList?.branches.find((branch) => branch.current)?.name ?? null; const isGitStatusOutOfSync = !!gitStatus?.branch && !!currentBranch && gitStatus.branch !== currentBranch; useEffect(() => { if (!isGitStatusOutOfSync) return; void invalidateGitQueries(queryClient); }, [isGitStatusOutOfSync, queryClient]); const gitStatusForActions = isGitStatusOutOfSync ? null : gitStatus; const allFiles = gitStatusForActions?.workingTree.files ?? []; const selectedFiles = allFiles.filter((f) => !excludedFiles.has(f.path)); const allSelected = excludedFiles.size === 0; const noneSelected = selectedFiles.length === 0; const initMutation = useMutation(gitInitMutationOptions({ cwd: gitCwd, queryClient })); const runImmediateGitActionMutation = useMutation( gitRunStackedActionMutationOptions({ cwd: gitCwd, queryClient, }), ); const pullMutation = useMutation(gitPullMutationOptions({ cwd: gitCwd, queryClient })); const isRunStackedActionRunning = useIsMutating({ mutationKey: gitMutationKeys.runStackedAction(gitCwd) }) > 0; const isPullRunning = useIsMutating({ mutationKey: gitMutationKeys.pull(gitCwd) }) > 0; const isGitActionRunning = isRunStackedActionRunning || isPullRunning; const isDefaultBranch = useMemo(() => { const branchName = gitStatusForActions?.branch; if (!branchName) return false; const current = branchList?.branches.find((branch) => branch.name === branchName); return current?.isDefault ?? (branchName === "main" || branchName === "master"); }, [branchList?.branches, gitStatusForActions?.branch]); const gitActionMenuItems = useMemo( () => buildMenuItems(gitStatusForActions, isGitActionRunning, hasOriginRemote), [gitStatusForActions, hasOriginRemote, isGitActionRunning], ); const quickAction = useMemo( () => resolveQuickAction(gitStatusForActions, isGitActionRunning, isDefaultBranch, hasOriginRemote), [gitStatusForActions, hasOriginRemote, isDefaultBranch, isGitActionRunning], ); const quickActionDisabledReason = quickAction.disabled ? (quickAction.hint ?? "This action is currently unavailable.") : null; const pendingDefaultBranchActionCopy = pendingDefaultBranchAction ? resolveDefaultBranchActionDialogCopy({ action: pendingDefaultBranchAction.action, branchName: pendingDefaultBranchAction.branchName, includesCommit: pendingDefaultBranchAction.includesCommit, }) : null; useEffect(() => { const api = readNativeApi(); if (!api) { return; } const applyProgressEvent = (event: GitActionProgressEvent) => { const progress = activeGitActionProgressRef.current; if (!progress) { return; } if (gitCwd && event.cwd !== gitCwd) { return; } if (progress.actionId !== event.actionId) { return; } const now = Date.now(); switch (event.kind) { case "action_started": progress.phaseStartedAtMs = now; progress.hookStartedAtMs = null; progress.hookName = null; progress.lastOutputLine = null; break; case "phase_started": progress.title = event.label; progress.currentPhaseLabel = event.label; progress.phaseStartedAtMs = now; progress.hookStartedAtMs = null; progress.hookName = null; progress.lastOutputLine = null; break; case "hook_started": progress.title = `Running ${event.hookName}...`; progress.hookName = event.hookName; progress.hookStartedAtMs = now; progress.lastOutputLine = null; break; case "hook_output": progress.lastOutputLine = event.text; break; case "hook_finished": progress.title = progress.currentPhaseLabel ?? "Committing..."; progress.hookName = null; progress.hookStartedAtMs = null; progress.lastOutputLine = null; break; case "action_finished": // Don't clear timestamps here — the HTTP response handler (line 496) // sets activeGitActionProgressRef to null and shows the success toast. // Clearing timestamps early causes the "Running for Xs" description // to disappear before the success state renders, leaving a bare // "Pushing..." toast in the gap between the WS event and HTTP response. return; case "action_failed": // Same reasoning as action_finished — let the HTTP error handler // manage the final toast state to avoid a flash of bare title. return; } updateActiveProgressToast(); }; return api.git.onActionProgress(applyProgressEvent); }, [gitCwd, updateActiveProgressToast]); useEffect(() => { const interval = window.setInterval(() => { if (!activeGitActionProgressRef.current) { return; } updateActiveProgressToast(); }, 1000); return () => { window.clearInterval(interval); }; }, [updateActiveProgressToast]); const openExistingPr = useCallback(async () => { const api = readNativeApi(); if (!api) { toastManager.add({ type: "error", title: "Link opening is unavailable.", data: threadToastData, }); return; } const prUrl = gitStatusForActions?.pr?.state === "open" ? gitStatusForActions.pr.url : null; if (!prUrl) { toastManager.add({ type: "error", title: "No open PR found.", data: threadToastData, }); return; } void api.shell.openExternal(prUrl).catch((err) => { toastManager.add({ type: "error", title: "Unable to open PR link", description: err instanceof Error ? err.message : "An error occurred.", data: threadToastData, }); }); }, [gitStatusForActions, threadToastData]); const runGitActionWithToast = useEffectEvent( async ({ action, commitMessage, forcePushOnlyProgress = false, onConfirmed, skipDefaultBranchPrompt = false, statusOverride, featureBranch = false, isDefaultBranchOverride, progressToastId, filePaths, }: RunGitActionWithToastInput) => { const actionStatus = statusOverride ?? gitStatusForActions; const actionBranch = actionStatus?.branch ?? null; const actionIsDefaultBranch = isDefaultBranchOverride ?? (featureBranch ? false : isDefaultBranch); const includesCommit = !forcePushOnlyProgress && (action === "commit" || !!actionStatus?.hasWorkingTreeChanges); if ( !skipDefaultBranchPrompt && requiresDefaultBranchConfirmation(action, actionIsDefaultBranch) && actionBranch ) { if (action !== "commit_push" && action !== "commit_push_pr") { return; } setPendingDefaultBranchAction({ action, branchName: actionBranch, includesCommit, ...(commitMessage ? { commitMessage } : {}), forcePushOnlyProgress, ...(onConfirmed ? { onConfirmed } : {}), ...(filePaths ? { filePaths } : {}), }); return; } onConfirmed?.(); const progressStages = buildGitActionProgressStages({ action, hasCustomCommitMessage: !!commitMessage?.trim(), hasWorkingTreeChanges: !!actionStatus?.hasWorkingTreeChanges, forcePushOnly: forcePushOnlyProgress, featureBranch, }); const actionId = randomUUID(); const resolvedProgressToastId = progressToastId ?? toastManager.add({ type: "loading", title: progressStages[0] ?? "Running git action...", description: "Waiting for Git...", timeout: 0, data: threadToastData, }); activeGitActionProgressRef.current = { toastId: resolvedProgressToastId, actionId, title: progressStages[0] ?? "Running git action...", phaseStartedAtMs: null, hookStartedAtMs: null, hookName: null, lastOutputLine: null, currentPhaseLabel: progressStages[0] ?? "Running git action...", }; if (progressToastId) { toastManager.update(progressToastId, { type: "loading", title: progressStages[0] ?? "Running git action...", description: "Waiting for Git...", timeout: 0, data: threadToastData, }); } const promise = runImmediateGitActionMutation.mutateAsync({ actionId, action, ...(commitMessage ? { commitMessage } : {}), ...(featureBranch ? { featureBranch } : {}), ...(filePaths ? { filePaths } : {}), }); try { const result = await promise; activeGitActionProgressRef.current = null; const resultToast = summarizeGitResult(result); const existingOpenPrUrl = actionStatus?.pr?.state === "open" ? actionStatus.pr.url : undefined;