fix(sessions): preflight every worktree move

2026-08-27 18:43:37 -06:00
parent 8fc08853b3
commit 26d6d72551
5 changed files with 45 additions and 80 deletions
@@ -71,7 +71,7 @@ import { copyTextToClipboard } from '@/lib/clipboard';
 import { buildExportFilename, downloadAsMarkdown, formatSessionAsMarkdown, saveAsMarkdownDesktop } from '@/lib/exportSession';
 import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog';
 import { Button } from '@/components/ui/button';
-import { startSessionTreeWorktreeMove, useIsSessionWorktreeMovePending } from '@/lib/worktrees/sessionWorktreeMove';
+import { requestSessionTreeMove, useIsSessionWorktreeMovePending } from '@/lib/worktrees/sessionWorktreeMove';

 const DESKTOP_HEADER_ICON_BUTTON_CLASS = 'app-region-no-drag inline-flex h-8 w-8 items-center justify-center gap-2 rounded-md typography-ui-label font-medium text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary disabled:pointer-events-none disabled:opacity-50 hover:bg-interactive-hover transition-colors';

@@ -1059,12 +1059,17 @@ export const Header: React.FC = () => {
      }
    }

-    startSessionTreeWorktreeMove({
+    requestSessionTreeMove({
+      kind: 'quick',
      root,
      descendants,
      sourceDirectory: sessionDirectory,
-      successMessage: t('sessions.sidebar.session.moveToWorktree.success'),
-      failureMessage: t('sessions.sidebar.session.moveToWorktree.failed'),
+      messages: {
+        success: t('sessions.sidebar.session.moveToWorktree.success'),
+        failure: t('sessions.sidebar.session.moveToWorktree.failed'),
+        sourceVerificationFailed: t('sessions.sidebar.session.moveToWorktree.sourceVerificationFailed'),
+        applyChangesFailed: t('sessions.sidebar.session.moveToWorktree.applyChangesFailed'),
+      },
    });
  }, [currentSessionId, isCurrentSessionActive, isCurrentSessionMovingToWorktree, sessionDirectory, t]);

@@ -11,6 +11,7 @@ import { HelpDialog } from '../ui/HelpDialog';
 import { OpenCodeStatusDialog } from '../ui/OpenCodeStatusDialog';
 import { SessionSidebar } from '@/components/session/SessionSidebar';
 import { SessionDialogs } from '@/components/session/SessionDialogs';
+import { SessionWorktreeMoveConfirmDialog } from '@/components/session/sidebar/SessionWorktreeMoveConfirmDialog';
 import { ScheduledTasksDialog } from '@/components/session/ScheduledTasksDialog';
 import { ArchiveView } from '@/components/views/ArchiveView';
 import { WorktreesView } from '@/components/views/WorktreesView';
@@ -19,6 +20,11 @@ import { MultiRunLauncher } from '@/components/multirun';

 import { useUIStore } from '@/stores/useUIStore';
 import { useSessionUIStore } from '@/sync/session-ui-store';
+import {
+  cancelSessionTreeMove,
+  confirmSessionTreeMove,
+  useSessionTreeMoveConfirmation,
+} from '@/lib/worktrees/sessionWorktreeMove';
 import { useUpdatePolling } from '@/hooks/useUpdatePolling';
 import { useDeviceInfo } from '@/lib/device';
 import { cn } from '@/lib/utils';
@@ -80,6 +86,8 @@ export const MainLayout: React.FC = () => {

    useUpdatePolling();

+    const sessionTreeMoveConfirmation = useSessionTreeMoveConfirmation();
+
    React.useEffect(() => {
        const previous = useUIStore.getState().isMobile;
        if (previous !== isMobile) {
@@ -97,6 +105,12 @@ export const MainLayout: React.FC = () => {
                <HelpDialog />
                <OpenCodeStatusDialog />
                <SessionDialogs />
+                <SessionWorktreeMoveConfirmDialog
+                    value={sessionTreeMoveConfirmation}
+                    onMoveSessionOnly={() => confirmSessionTreeMove(false)}
+                    onMoveAllChanges={() => confirmSessionTreeMove(true)}
+                    onCancel={cancelSessionTreeMove}
+                />

                {/* Persistent top-left controls (toggle + project actions) that
                    stay put while the sidebar/header animate beneath them. */}
@@ -48,8 +48,7 @@ import { MultiRunFusionDialog } from '@/components/multirun/MultiRunFusionDialog
 import { FusionIcon } from '@/components/icons/FusionIcon';
 import { RuntimeAPIContext } from '@/contexts/runtimeAPIContext';
 import {
-  startSessionTreeExistingWorktreeMove,
-  startSessionTreeWorktreeMove,
+  requestSessionTreeMove,
  useIsSessionWorktreeMovePending,
 } from '@/lib/worktrees/sessionWorktreeMove';
 import { streamPerfCount } from '@/stores/utils/streamDebug';
@@ -1042,13 +1041,18 @@ function SessionNodeItemComponent(props: SessionNodeItemProps): React.ReactNode
                      if (isDisabled || !sessionDirectory) {
                        return;
                      }
-                      startSessionTreeExistingWorktreeMove({
+                      requestSessionTreeMove({
+                        kind: 'existing',
                        root: resolvedSession,
                        descendants: collectNodeDescendantSessions(node),
                        sourceDirectory: sessionDirectory,
                        destination: target.metadata,
-                        successMessage: t('sessions.sidebar.session.moveToWorktree.existingSuccess'),
-                        failureMessage: t('sessions.sidebar.session.moveToWorktree.existingFailed'),
+                        messages: {
+                          success: t('sessions.sidebar.session.moveToWorktree.existingSuccess'),
+                          failure: t('sessions.sidebar.session.moveToWorktree.existingFailed'),
+                          sourceVerificationFailed: t('sessions.sidebar.session.moveToWorktree.sourceVerificationFailed'),
+                          applyChangesFailed: t('sessions.sidebar.session.moveToWorktree.applyChangesFailed'),
+                        },
                      });
                    }}
                  >
@@ -1077,12 +1081,17 @@ function SessionNodeItemComponent(props: SessionNodeItemProps): React.ReactNode
                  data-session-worktree-new-action="true"
                  onClick={() => {
                    if (isWorktreeMenuDisabled || !sessionDirectory) return;
-                    startSessionTreeWorktreeMove({
+                    requestSessionTreeMove({
+                      kind: 'quick',
                      root: resolvedSession,
                      descendants: collectNodeDescendantSessions(node),
                      sourceDirectory: sessionDirectory,
-                      successMessage: t('sessions.sidebar.session.moveToWorktree.success'),
-                      failureMessage: t('sessions.sidebar.session.moveToWorktree.failed'),
+                      messages: {
+                        success: t('sessions.sidebar.session.moveToWorktree.success'),
+                        failure: t('sessions.sidebar.session.moveToWorktree.failed'),
+                        sourceVerificationFailed: t('sessions.sidebar.session.moveToWorktree.sourceVerificationFailed'),
+                        applyChangesFailed: t('sessions.sidebar.session.moveToWorktree.applyChangesFailed'),
+                      },
                    });
                  }}
                  className="[&>svg]:mr-1"