Address review feedback on studio uninstall command

Author: bcotrim

apps/cli/commands/tests/uninstall.test.ts

@@ -1,10 +1,13 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import trash from 'trash';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { getCliInstallKind } from 'cli/lib/update-notifier';
 import { runCommand } from '../uninstall';
 
+vi.mock( 'trash' );
+
 vi.mock( 'cli/lib/update-notifier', async ( importOriginal ) => ( {
 	...( await importOriginal< typeof import('cli/lib/update-notifier') >() ),
 	getCliInstallKind: vi.fn(),
@@ -57,6 +60,7 @@ describe( 'CLI: studio uninstall', () => {
 		} );
 		setPlatform( originalPlatform );
 		delete process.env.DEV_CONFIG_DIR;
+		process.exitCode = 0;
 		fs.rmSync( root, { recursive: true, force: true } );
 		vi.restoreAllMocks();
 	} );
@@ -69,13 +73,13 @@ describe( 'CLI: studio uninstall', () => {
 		expect( fs.existsSync( configDir ) ).toBe( true );
 	} );
 
-	it( 'removes user config too when --purge is passed non-interactively', async () => {
+	it( 'trashes user config when --purge is passed non-interactively', async () => {
 		Object.defineProperty( process.stdin, 'isTTY', { value: false, configurable: true } );
 
 		await runCommand( true );
 
 		expect( fs.existsSync( path.join( installDir, 'cli' ) ) ).toBe( false );
-		expect( fs.existsSync( configDir ) ).toBe( false );
+		expect( trash ).toHaveBeenCalledWith( configDir );
 	} );
 
 	it( 'does nothing destructive for non-standalone installs', async () => {
@@ -84,6 +88,7 @@ describe( 'CLI: studio uninstall', () => {
 		await runCommand( true );
 
 		expect( fs.existsSync( path.join( installDir, 'bin' ) ) ).toBe( true );
-		expect( fs.existsSync( configDir ) ).toBe( true );
+		expect( trash ).not.toHaveBeenCalled();
+		expect( process.exitCode ).toBe( 1 );
 	} );
 } );

apps/cli/commands/uninstall.ts

@@ -5,6 +5,7 @@ import path from 'node:path';
 import { confirm } from '@inquirer/prompts';
 import { getConfigDirectory } from '@studio/common/lib/well-known-paths';
 import { __, sprintf } from '@wordpress/i18n';
+import trash from 'trash';
 import { Mode, runCommand as stopSites } from 'cli/commands/site/stop';
 import { getCliInstallKind } from 'cli/lib/update-notifier';
 import { StudioArgv } from 'cli/types';
@@ -73,6 +74,7 @@ export async function runCommand( purge: boolean ): Promise< void > {
 		console.log(
 			__( 'This Studio CLI was installed via npm. Remove it with: npm rm -g wp-studio' )
 		);
+		process.exitCode = 1;
 		return;
 	}
 	if ( installKind !== 'standalone' ) {
@@ -81,6 +83,7 @@ export async function runCommand( purge: boolean ): Promise< void > {
 				'This Studio CLI is bundled with the Studio desktop app. Uninstall the app to remove it.'
 			)
 		);
+		process.exitCode = 1;
 		return;
 	}
 
@@ -100,7 +103,7 @@ export async function runCommand( purge: boolean ): Promise< void > {
 		removeConfig = await confirm( {
 			message: sprintf(
 				/* translators: %s is the config directory path */
-				__( 'Permanently delete your Studio config and site list in %s?' ),
+				__( 'Delete your Studio config in %s?' ),
 				configDir
 			),
 			default: false,
@@ -125,7 +128,9 @@ export async function runCommand( purge: boolean ): Promise< void > {
 	}
 
 	if ( removeConfig ) {
-		fs.rmSync( configDir, { recursive: true, force: true } );
+		// Trash rather than hard-delete — the user's sites/config are recoverable if they
+		// change their mind.
+		await trash( configDir );
 		removed.push( configDir );
 	}
 
@@ -137,7 +142,7 @@ export async function runCommand( purge: boolean ): Promise< void > {
 		console.log(
 			sprintf(
 				/* translators: %s is the config directory path */
-				__( '\nYour sites and config were kept in %s. Re-run with --purge to remove them.' ),
+				__( '\nYour Studio config and sites are still in %s.' ),
 				configDir
 			)
 		);
@@ -159,7 +164,7 @@ export const registerCommand = ( yargs: StudioArgv ) => {
 			return yargs.option( 'purge', {
 				type: 'boolean',
 				alias: 'all',
-				describe: __( 'Also delete your Studio config and site list (~/.studio)' ),
+				describe: __( 'Also delete your Studio config (~/.studio)' ),
 				default: false,
 			} );
 		},

apps/cli/lib/update-notifier.ts

@@ -194,11 +194,8 @@ async function notifyStandalone( currentVersion: string ): Promise< void > {
 
 	let latestVersion: string | null = null;
 
-	// Ignore a cached check from a different channel than the running CLI. The cache is
-	// keyed only by config dir (~/.studio), which is shared across installs — reinstalling
-	// a different channel (e.g. nightly → production) onto it would otherwise surface a
-	// stale, cross-channel banner (a `-dev` build offered to a production install) until the
-	// TTL elapses. On a mismatch we refetch and let the server decide.
+	// ~/.studio is shared across installs, so a cache left by a different channel (e.g. a
+	// prior nightly) must not be trusted for this one — refetch on a channel mismatch.
 	if (
 		cached &&
 		now - cached.lastChecked < UPDATE_CHECK_INTERVAL_MS &&