Sync upstream Gemini-CLI v0.8.2 (#838)

packages/cli/src/ui/components/WorkspaceMigrationDialog.tsx

@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text, useInput } from 'ink';
+import { Box, Text } from 'ink';
 import {
   type Extension,
   performWorkspaceExtensionMigration,
 } from '../../config/extension.js';
 import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { Colors } from '../colors.js';
+import { theme } from '../semantic-colors.js';
 import { useState } from 'react';
+import { useKeypress } from '../hooks/useKeypress.js';
 
 export function WorkspaceMigrationDialog(props: {
   workspaceExtensions: Extension[];
@@ -23,32 +24,38 @@ export function WorkspaceMigrationDialog(props: {
   const [failedExtensions, setFailedExtensions] = useState<string[]>([]);
   onOpen();
   const onMigrate = async () => {
-    const failed =
-      await performWorkspaceExtensionMigration(workspaceExtensions);
+    const failed = await performWorkspaceExtensionMigration(
+      workspaceExtensions,
+      // We aren't updating extensions, just moving them around, don't need to ask for consent.
+      async (_) => true,
+    );
     setFailedExtensions(failed);
     setMigrationComplete(true);
   };
 
-  useInput((input) => {
-    if (migrationComplete && input === 'q') {
-      process.exit(0);
-    }
-  });
+  useKeypress(
+    (key) => {
+      if (migrationComplete && key.sequence === 'q') {
+        process.exit(0);
+      }
+    },
+    { isActive: true },
+  );
 
   if (migrationComplete) {
     return (
       <Box
         flexDirection="column"
         borderStyle="round"
-        borderColor={Colors.Gray}
+        borderColor={theme.border.default}
         padding={1}
       >
         {failedExtensions.length > 0 ? (
           <>
-            <Text>
+            <Text color={theme.text.primary}>
               The following extensions failed to migrate. Please try installing
               them manually. To see other changes, Qwen Code must be restarted.
-              Press {"'q'"} to quit.
+              Press &apos;q&apos; to quit.
             </Text>
             <Box flexDirection="column" marginTop={1} marginLeft={2}>
               {failedExtensions.map((failed) => (
@@ -57,9 +64,9 @@ export function WorkspaceMigrationDialog(props: {
             </Box>
           </>
         ) : (
-          <Text>
+          <Text color={theme.text.primary}>
             Migration complete. To see changes, Qwen Code must be restarted.
-            Press {"'q'"} to quit.
+            Press &apos;q&apos; to quit.
           </Text>
         )}
       </Box>
@@ -70,15 +77,19 @@ export function WorkspaceMigrationDialog(props: {
     <Box
       flexDirection="column"
       borderStyle="round"
-      borderColor={Colors.Gray}
+      borderColor={theme.border.default}
       padding={1}
     >
-      <Text bold>Workspace-level extensions are deprecated{'\n'}</Text>
-      <Text>Would you like to install them at the user level?</Text>
-      <Text>
+      <Text bold color={theme.text.primary}>
+        Workspace-level extensions are deprecated{'\n'}
+      </Text>
+      <Text color={theme.text.primary}>
+        Would you like to install them at the user level?
+      </Text>
+      <Text color={theme.text.primary}>
         The extension definition will remain in your workspace directory.
       </Text>
-      <Text>
+      <Text color={theme.text.primary}>
         If you opt to skip, you can install them manually using the extensions
         install command.
       </Text>
@@ -91,8 +102,8 @@ export function WorkspaceMigrationDialog(props: {
       <Box marginTop={1}>
         <RadioButtonSelect
           items={[
-            { label: 'Install all', value: 'migrate' },
-            { label: 'Skip', value: 'skip' },
+            { label: 'Install all', value: 'migrate', key: 'migrate' },
+            { label: 'Skip', value: 'skip', key: 'skip' },
           ]}
           onSelect={(value: string) => {
             if (value === 'migrate') {