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

2026-04-28 11:41:04 +00:00 · 2025-10-23 09:27:04 +08:00 · 2025-10-23 09:27:04 +08:00 · eb95c131be
commit eb95c131be
parent 096fabb5d6
644 changed files with 70389 additions and 23709 deletions
--- a/packages/cli/src/ui/components/Composer.tsx
+++ b/packages/cli/src/ui/components/Composer.tsx
@ -0,0 +1,163 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Box, Text, useIsScreenReaderEnabled } from 'ink';
+import { useMemo } from 'react';
+import { LoadingIndicator } from './LoadingIndicator.js';
+import { ContextSummaryDisplay } from './ContextSummaryDisplay.js';
+import { AutoAcceptIndicator } from './AutoAcceptIndicator.js';
+import { ShellModeIndicator } from './ShellModeIndicator.js';
+import { DetailedMessagesDisplay } from './DetailedMessagesDisplay.js';
+import { InputPrompt, calculatePromptWidths } from './InputPrompt.js';
+import { Footer } from './Footer.js';
+import { ShowMoreLines } from './ShowMoreLines.js';
+import { QueuedMessageDisplay } from './QueuedMessageDisplay.js';
+import { OverflowProvider } from '../contexts/OverflowContext.js';
+import { theme } from '../semantic-colors.js';
+import { isNarrowWidth } from '../utils/isNarrowWidth.js';
+import { useUIState } from '../contexts/UIStateContext.js';
+import { useUIActions } from '../contexts/UIActionsContext.js';
+import { useVimMode } from '../contexts/VimModeContext.js';
+import { useConfig } from '../contexts/ConfigContext.js';
+import { useSettings } from '../contexts/SettingsContext.js';
+import { ApprovalMode } from '@qwen-code/qwen-code-core';
+import { StreamingState } from '../types.js';
+import { ConfigInitDisplay } from '../components/ConfigInitDisplay.js';
+
+export const Composer = () => {
+  const config = useConfig();
+  const settings = useSettings();
+  const isScreenReaderEnabled = useIsScreenReaderEnabled();
+  const uiState = useUIState();
+  const uiActions = useUIActions();
+  const { vimEnabled } = useVimMode();
+  const terminalWidth = process.stdout.columns;
+  const isNarrow = isNarrowWidth(terminalWidth);
+  const debugConsoleMaxHeight = Math.floor(Math.max(terminalWidth * 0.2, 5));
+
+  const { contextFileNames, showAutoAcceptIndicator } = uiState;
+
+  // Use the container width of InputPrompt for width of DetailedMessagesDisplay
+  const { containerWidth } = useMemo(
+    () => calculatePromptWidths(uiState.terminalWidth),
+    [uiState.terminalWidth],
+  );
+
+  return (
+    <Box flexDirection="column">
+      {!uiState.embeddedShellFocused && (
+        <LoadingIndicator
+          thought={
+            uiState.streamingState === StreamingState.WaitingForConfirmation ||
+            config.getAccessibility()?.disableLoadingPhrases
+              ? undefined
+              : uiState.thought
+          }
+          currentLoadingPhrase={
+            config.getAccessibility()?.disableLoadingPhrases
+              ? undefined
+              : uiState.currentLoadingPhrase
+          }
+          elapsedTime={uiState.elapsedTime}
+        />
+      )}
+
+      {!uiState.isConfigInitialized && <ConfigInitDisplay />}
+
+      <QueuedMessageDisplay messageQueue={uiState.messageQueue} />
+
+      <Box
+        marginTop={1}
+        justifyContent={
+          settings.merged.ui?.hideContextSummary
+            ? 'flex-start'
+            : 'space-between'
+        }
+        width="100%"
+        flexDirection={isNarrow ? 'column' : 'row'}
+        alignItems={isNarrow ? 'flex-start' : 'center'}
+      >
+        <Box marginRight={1}>
+          {process.env['GEMINI_SYSTEM_MD'] && (
+            <Text color={theme.status.error}>|⌐■_■| </Text>
+          )}
+          {uiState.ctrlCPressedOnce ? (
+            <Text color={theme.status.warning}>
+              Press Ctrl+C again to exit.
+            </Text>
+          ) : uiState.ctrlDPressedOnce ? (
+            <Text color={theme.status.warning}>
+              Press Ctrl+D again to exit.
+            </Text>
+          ) : uiState.showEscapePrompt ? (
+            <Text color={theme.text.secondary}>Press Esc again to clear.</Text>
+          ) : (
+            !settings.merged.ui?.hideContextSummary && (
+              <ContextSummaryDisplay
+                ideContext={uiState.ideContextState}
+                geminiMdFileCount={uiState.geminiMdFileCount}
+                contextFileNames={contextFileNames}
+                mcpServers={config.getMcpServers()}
+                blockedMcpServers={config.getBlockedMcpServers()}
+                showToolDescriptions={uiState.showToolDescriptions}
+              />
+            )
+          )}
+        </Box>
+        <Box paddingTop={isNarrow ? 1 : 0}>
+          {showAutoAcceptIndicator !== ApprovalMode.DEFAULT &&
+            !uiState.shellModeActive && (
+              <AutoAcceptIndicator approvalMode={showAutoAcceptIndicator} />
+            )}
+          {uiState.shellModeActive && <ShellModeIndicator />}
+        </Box>
+      </Box>
+
+      {uiState.showErrorDetails && (
+        <OverflowProvider>
+          <Box flexDirection="column">
+            <DetailedMessagesDisplay
+              messages={uiState.filteredConsoleMessages}
+              maxHeight={
+                uiState.constrainHeight ? debugConsoleMaxHeight : undefined
+              }
+              width={containerWidth}
+            />
+            <ShowMoreLines constrainHeight={uiState.constrainHeight} />
+          </Box>
+        </OverflowProvider>
+      )}
+
+      {uiState.isInputActive && (
+        <InputPrompt
+          buffer={uiState.buffer}
+          inputWidth={uiState.inputWidth}
+          suggestionsWidth={uiState.suggestionsWidth}
+          onSubmit={uiActions.handleFinalSubmit}
+          userMessages={uiState.userMessages}
+          onClearScreen={uiActions.handleClearScreen}
+          config={config}
+          slashCommands={uiState.slashCommands}
+          commandContext={uiState.commandContext}
+          shellModeActive={uiState.shellModeActive}
+          setShellModeActive={uiActions.setShellModeActive}
+          approvalMode={showAutoAcceptIndicator}
+          onEscapePromptChange={uiActions.onEscapePromptChange}
+          focus={true}
+          vimHandleInput={uiActions.vimHandleInput}
+          isEmbeddedShellFocused={uiState.embeddedShellFocused}
+          placeholder={
+            vimEnabled
+              ? "  Press 'i' for INSERT mode and 'Esc' for NORMAL mode."
+              : '  Type your message or @path/to/file'
+          }
+        />
+      )}
+
+      {!settings.merged.ui?.hideFooter && !isScreenReaderEnabled && <Footer />}
+    </Box>
+  );
+};