Clear sync state on user logout

apps/studio/__mocks__/electron.ts

@@ -19,6 +19,7 @@ export const app = {
 	on: vi.fn(),
 	off: vi.fn(),
 	setAppLogsPath: vi.fn(),
+	removeAsDefaultProtocolClient: vi.fn(),
 	setAsDefaultProtocolClient: vi.fn(),
 	enableSandbox: vi.fn(),
 	commandLine: {

apps/studio/src/components/auth-provider.tsx

@@ -8,7 +8,8 @@ import { useOffline } from 'src/hooks/use-offline';
 import { getIpcApi } from 'src/lib/get-ipc-api';
 import { isInvalidTokenError } from 'src/lib/is-invalid-oauth-token-error';
 import { setSentryWpcomUserIdRenderer } from 'src/lib/renderer-sentry-utils';
-import { useI18nLocale } from 'src/stores';
+import { useAppDispatch, useI18nLocale } from 'src/stores';
+import { userLoggedOut } from 'src/stores/auth-actions';
 import { setWpcomClient } from 'src/stores/wpcom-api';
 import type { WPCOM } from 'wpcom/types';
 
@@ -46,21 +47,22 @@ const AuthProvider: React.FC< AuthProviderProps > = ( { children } ) => {
 	const { __ } = useI18n();
 	const isOffline = useOffline();
 
+	const dispatch = useAppDispatch();
 	const authenticate = useCallback( () => getIpcApi().authenticate(), [] );
 
 	const handleInvalidToken = useCallback( async () => {
 		try {
 			void getIpcApi().logRendererMessage( 'info', 'Detected invalid token. Logging out.' );
+			dispatch( userLoggedOut() );
 			await getIpcApi().clearAuthenticationToken();
 			setIsAuthenticated( false );
 			setClient( undefined );
-			setWpcomClient( undefined );
 			setUser( undefined );
 			setSentryWpcomUserIdRenderer( undefined );
 		} catch ( err ) {
 			console.error( 'Failed to handle invalid token:', err );
 		}
-	}, [] );
+	}, [ dispatch ] );
 
 	useIpcListener( 'auth-updated', ( _event, payload ) => {
 		if ( 'error' in payload ) {
@@ -121,16 +123,16 @@ const AuthProvider: React.FC< AuthProviderProps > = ( { children } ) => {
 		}
 
 		try {
+			dispatch( userLoggedOut() );
 			await getIpcApi().clearAuthenticationToken();
 			setIsAuthenticated( false );
 			setClient( undefined );
-			setWpcomClient( undefined );
 			setUser( undefined );
 			setSentryWpcomUserIdRenderer( undefined );
 		} catch ( err ) {
 			console.error( err );
 		}
-	}, [ client, isOffline ] );
+	}, [ client, dispatch, isOffline ] );
 
 	useEffect( () => {
 		async function run() {

apps/studio/src/components/content-tab-import-export.tsx

@@ -17,6 +17,10 @@ import { useConfirmationDialog } from 'src/hooks/use-confirmation-dialog';
 import { useDragAndDropFile } from 'src/hooks/use-drag-and-drop-file';
 import { useImportExport } from 'src/hooks/use-import-export';
 import { useSiteDetails } from 'src/hooks/use-site-details';
+import {
+	pullBackupIsDownloadingOrImporting,
+	pushBackupIsUploading,
+} from 'src/lib/active-sync-operations';
 import { cx } from 'src/lib/cx';
 import { getIpcApi } from 'src/lib/get-ipc-api';
 import { useRootSelector } from 'src/stores';
@@ -344,17 +348,27 @@ export function ContentTabImportExport( { selectedSite }: ContentTabImportExport
 		localSiteId: selectedSite.id,
 		userId: user?.id,
 	} );
-	const isPulling = useRootSelector( ( state ) =>
-		connectedSites.some( ( site ) =>
-			syncOperationsSelectors.selectIsSiteIdPulling( selectedSite.id, site.id )( state )
-		)
+	const isPullingLocally = useRootSelector( ( state ) =>
+		connectedSites.some( ( site ) => {
+			const pullState = syncOperationsSelectors.selectPullState(
+				selectedSite.id,
+				site.id
+			)( state );
+			return pullBackupIsDownloadingOrImporting( pullState?.status.key );
+		} )
 	);
-	const isPushing = useRootSelector( ( state ) =>
-		connectedSites.some( ( site ) =>
-			syncOperationsSelectors.selectIsSiteIdPushing( selectedSite.id, site.id )( state )
-		)
+	// Only block import/export while the local machine is actively involved in sync.
+	// After the backup upload completes, the push continues remotely and should not block import/export.
+	const isUploadingPushBackup = useRootSelector( ( state ) =>
+		connectedSites.some( ( site ) => {
+			const pushState = syncOperationsSelectors.selectPushState(
+				selectedSite.id,
+				site.id
+			)( state );
+			return pushBackupIsUploading( pushState?.status.key );
+		} )
 	);
-	const isThisSiteSyncing = isPulling || isPushing;
+	const isThisSiteSyncing = isPullingLocally || isUploadingPushBackup;
 
 	useEffect( () => {
 		getIpcApi()

apps/studio/src/components/publish-site-button.tsx

@@ -3,6 +3,10 @@ import { useI18n } from '@wordpress/react-i18n';
 import { useCallback } from 'react';
 import { useAuth } from 'src/hooks/use-auth';
 import { useSiteDetails } from 'src/hooks/use-site-details';
+import {
+	pullBackupIsDownloadingOrImporting,
+	pushBackupIsUploading,
+} from 'src/lib/active-sync-operations';
 import { generateCheckoutUrl } from 'src/lib/generate-checkout-url';
 import { getIpcApi } from 'src/lib/get-ipc-api';
 import { ConnectButton } from 'src/modules/sync/components/connect-button';
@@ -18,9 +22,15 @@ export const PublishSiteButton = () => {
 		localSiteId: selectedSite?.id,
 		userId: user?.id,
 	} );
-	const isAnySitePulling = useRootSelector( syncOperationsSelectors.selectIsAnySitePulling );
-	const isAnySitePushing = useRootSelector( syncOperationsSelectors.selectIsAnySitePushing );
-	const isAnySiteSyncing = isAnySitePulling || isAnySitePushing;
+	const isAnySiteDoingLocalSyncWork = useRootSelector( ( state ) => {
+		const anyPullLocal = Object.values( syncOperationsSelectors.selectPullStates( state ) ).some(
+			( pullState ) => pullBackupIsDownloadingOrImporting( pullState.status.key )
+		);
+		const anyPushLocal = Object.values( syncOperationsSelectors.selectPushStates( state ) ).some(
+			( pushState ) => pushBackupIsUploading( pushState.status.key )
+		);
+		return anyPullLocal || anyPushLocal;
+	} );
 
 	const handlePublishClick = useCallback( () => {
 		if ( ! selectedSite ) return;
@@ -36,9 +46,9 @@ export const PublishSiteButton = () => {
 			variant="primary"
 			icon={ cloudUpload }
 			connectSite={ handlePublishClick }
-			disabled={ isAnySiteSyncing }
+			disabled={ isAnySiteDoingLocalSyncWork }
 			tooltipText={
-				isAnySiteSyncing
+				isAnySiteDoingLocalSyncWork
 					? __(
 							'Another site is syncing. Please wait for the sync to finish before you publish your site.'
 					  )

apps/studio/src/components/settings-site-menu.tsx

@@ -1,5 +1,9 @@
 import { MenuItem } from '@wordpress/components';
 import { useSiteDetails } from 'src/hooks/use-site-details';
+import {
+	pullBackupIsDownloadingOrImporting,
+	pushBackupIsUploading,
+} from 'src/lib/active-sync-operations';
 import { useRootSelector } from 'src/stores';
 import { syncOperationsSelectors } from 'src/stores/sync';
 
@@ -15,18 +19,30 @@ export const SettingsMenuItem = ( {
 	isDestructive = false,
 }: SettingsMenuItemProps ) => {
 	const { isDeleting, sites, selectedSite } = useSiteDetails();
-	const isPulling = useRootSelector(
-		syncOperationsSelectors.selectIsSiteIdPulling( selectedSite?.id ?? '' )
-	);
-	const isPushing = useRootSelector(
-		syncOperationsSelectors.selectIsSiteIdPushing( selectedSite?.id ?? '' )
-	);
+	const selectedSiteId = selectedSite?.id;
+	const isThisSiteDoingLocalSyncWork = useRootSelector( ( state ) => {
+		if ( ! selectedSiteId ) {
+			return false;
+		}
+		const pullStates = syncOperationsSelectors.selectPullStates( state );
+		const pushStates = syncOperationsSelectors.selectPushStates( state );
+		const anyPullLocal = Object.values( pullStates ).some(
+			( pullState ) =>
+				pullState.selectedSite?.id === selectedSiteId &&
+				pullBackupIsDownloadingOrImporting( pullState.status.key )
+		);
+		const anyPushLocal = Object.values( pushStates ).some(
+			( pushState ) =>
+				pushState.selectedSite?.id === selectedSiteId &&
+				pushBackupIsUploading( pushState.status.key )
+		);
+		return anyPullLocal || anyPushLocal;
+	} );
 	if ( ! selectedSite ) {
 		return null;
 	}
-	const isThisSiteSyncing = isPulling || isPushing;
 	const isAddingSite = sites.some( ( site ) => site.isAddingSite );
-	const isDisabled = isDeleting || isThisSiteSyncing || isAddingSite;
+	const isDisabled = isDeleting || isThisSiteDoingLocalSyncWork || isAddingSite;
 
 	return (
 		<MenuItem

apps/studio/src/components/site-management-actions.tsx

@@ -4,6 +4,7 @@ import { ActionButton } from 'src/components/action-button';
 import { PublishSiteButton } from 'src/components/publish-site-button';
 import { Tooltip } from 'src/components/tooltip';
 import { useImportExport } from 'src/hooks/use-import-export';
+import { pullBackupIsDownloadingOrImporting } from 'src/lib/active-sync-operations';
 import { useRootSelector } from 'src/stores';
 import { syncOperationsSelectors } from 'src/stores/sync';
 
@@ -22,19 +23,26 @@ export const SiteManagementActions = ( {
 }: SiteManagementActionProps ) => {
 	const { __ } = useI18n();
 	const { isSiteImporting } = useImportExport();
-	const isPulling = useRootSelector(
-		syncOperationsSelectors.selectIsSiteIdPulling( selectedSite?.id ?? '' )
-	);
+	const isPullingLocally = useRootSelector( ( state ) => {
+		if ( ! selectedSite ) {
+			return false;
+		}
+		return Object.values( syncOperationsSelectors.selectPullStates( state ) ).some(
+			( pullState ) =>
+				pullState.selectedSite?.id === selectedSite.id &&
+				pullBackupIsDownloadingOrImporting( pullState.status.key )
+		);
+	} );
 
 	if ( ! selectedSite ) {
 		return null;
 	}
 
 	const isImporting = isSiteImporting( selectedSite.id );
-	const disabled = isImporting || isPulling;
+	const disabled = isImporting || isPullingLocally;
 
 	let buttonLabelOnDisabled: string = __( 'Importing…' );
-	if ( isPulling ) {
+	if ( isPullingLocally ) {
 		buttonLabelOnDisabled = __( 'Pulling…' );
 	}
 

apps/studio/src/hooks/use-import-export.tsx

@@ -6,9 +6,20 @@ import {
 	ValidatorEvents,
 } from '@studio/common/lib/import-export-events';
 import { __, sprintf } from '@wordpress/i18n';
-import { createContext, useMemo, useState, useCallback, useContext } from 'react';
+import {
+	createContext,
+	useEffect,
+	useMemo,
+	useRef,
+	useState,
+	useCallback,
+	useContext,
+} from 'react';
+import { useAuth } from 'src/hooks/use-auth';
 import { useIpcListener } from 'src/hooks/use-ipc-listener';
 import { getIpcApi } from 'src/lib/get-ipc-api';
+import { useRootSelector } from 'src/stores';
+import { syncOperationsSelectors } from 'src/stores/sync/sync-operations-slice';
 
 export type ImportProgressState = {
 	[ siteId: string ]: {
@@ -65,6 +76,27 @@ const WP_CONTENT_TYPE_LABELS: Record< string, string > = {
 export const ImportExportProvider = ( { children }: { children: React.ReactNode } ) => {
 	const [ importState, setImportState ] = useState< ImportProgressState >( {} );
 	const [ exportState, setExportState ] = useState< ExportProgressState >( {} );
+	const { isAuthenticated } = useAuth();
+	const isAnyPullActive = useRootSelector( syncOperationsSelectors.selectIsAnySitePulling );
+
+	// Snapshot the latest pre-logout pull-active value while still authenticated.
+	// pullStates is reset synchronously on userLoggedOut, so by the time the effect
+	// below sees `isAuthenticated === false`, isAnyPullActive is already false.
+	const hadActivePullRef = useRef( false );
+	if ( isAuthenticated ) {
+		hadActivePullRef.current = isAnyPullActive;
+	}
+
+	useEffect( () => {
+		// On logout, only clear import/export state if no pull was in flight.
+		// An active pull's import phase is driven by main-process events that
+		// would just repopulate this state, so leave it alone and let the
+		// import finish.
+		if ( ! isAuthenticated && ! hadActivePullRef.current ) {
+			setImportState( {} );
+			setExportState( {} );
+		}
+	}, [ isAuthenticated ] );
 
 	const importFile = useCallback(
 		async (

apps/studio/src/index.ts

@@ -157,13 +157,15 @@ async function appBoot() {
 
 	setupUpdates();
 
+	const appArgs = process.argv.length >= 2 ? [ path.resolve( process.argv[ 1 ] ) ] : [];
+
 	if ( process.defaultApp ) {
-		if ( process.argv.length >= 2 ) {
-			app.setAsDefaultProtocolClient( PROTOCOL_PREFIX, process.execPath, [
-				path.resolve( process.argv[ 1 ] ),
-			] );
+		if ( appArgs.length > 0 ) {
+			app.removeAsDefaultProtocolClient( PROTOCOL_PREFIX, process.execPath, appArgs );
+			app.setAsDefaultProtocolClient( PROTOCOL_PREFIX, process.execPath, appArgs );
 		}
 	} else {
+		app.removeAsDefaultProtocolClient( PROTOCOL_PREFIX );
 		app.setAsDefaultProtocolClient( PROTOCOL_PREFIX );
 	}
 

apps/studio/src/lib/active-sync-operations.ts

@@ -59,6 +59,22 @@ export function pushBackupIsUploading( key: PushStateProgressInfo[ 'key' ] | und
 	return uploadingStateKeys.includes( key );
 }
 
+/**
+ * Check if a pull operation is doing local work (download/import).
+ *
+ * The initial "in-progress" phase is remote backup creation and should not be treated as local work
+ * when deciding whether to block unrelated local operations.
+ */
+export function pullBackupIsDownloadingOrImporting(
+	key: PullStateProgressInfo[ 'key' ] | undefined
+): boolean {
+	const localPullKeys: PullStateProgressInfo[ 'key' ][] = [ 'downloading', 'importing' ];
+	if ( ! key ) {
+		return false;
+	}
+	return localPullKeys.includes( key );
+}
+
 export function hasUploadingPushOperations(): boolean {
 	//  Iterate over all the sites and check if any operation is cancelable
 	let result = false;