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

packages/cli/src/test-utils/createExtension.ts

@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import {
+  EXTENSIONS_CONFIG_FILENAME,
+  INSTALL_METADATA_FILENAME,
+} from '../config/extension.js';
+import {
+  type MCPServerConfig,
+  type ExtensionInstallMetadata,
+} from '@qwen-code/qwen-code-core';
+
+export function createExtension({
+  extensionsDir = 'extensions-dir',
+  name = 'my-extension',
+  version = '1.0.0',
+  addContextFile = false,
+  contextFileName = undefined as string | undefined,
+  mcpServers = {} as Record<string, MCPServerConfig>,
+  installMetadata = undefined as ExtensionInstallMetadata | undefined,
+} = {}): string {
+  const extDir = path.join(extensionsDir, name);
+  fs.mkdirSync(extDir, { recursive: true });
+  fs.writeFileSync(
+    path.join(extDir, EXTENSIONS_CONFIG_FILENAME),
+    JSON.stringify({ name, version, contextFileName, mcpServers }),
+  );
+
+  if (addContextFile) {
+    fs.writeFileSync(path.join(extDir, 'QWEN.md'), 'context');
+  }
+
+  if (contextFileName) {
+    fs.writeFileSync(path.join(extDir, contextFileName), 'context');
+  }
+
+  if (installMetadata) {
+    fs.writeFileSync(
+      path.join(extDir, INSTALL_METADATA_FILENAME),
+      JSON.stringify(installMetadata),
+    );
+  }
+  return extDir;
+}

packages/cli/src/test-utils/mockCommandContext.ts

@@ -57,6 +57,8 @@ export const createMockCommandContext = (
       loadHistory: vi.fn(),
       toggleCorgiMode: vi.fn(),
       toggleVimEnabled: vi.fn(),
+      extensionsUpdateState: new Map(),
+      setExtensionsUpdateState: vi.fn(),
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } as any,
     session: {

packages/cli/src/test-utils/render.tsx

@@ -6,13 +6,30 @@
 
 import { render } from 'ink-testing-library';
 import type React from 'react';
+import { LoadedSettings } from '../config/settings.js';
 import { KeypressProvider } from '../ui/contexts/KeypressContext.js';
+import { SettingsContext } from '../ui/contexts/SettingsContext.js';
+import { ShellFocusContext } from '../ui/contexts/ShellFocusContext.js';
+
+const mockSettings = new LoadedSettings(
+  { path: '', settings: {}, originalSettings: {} },
+  { path: '', settings: {}, originalSettings: {} },
+  { path: '', settings: {}, originalSettings: {} },
+  { path: '', settings: {}, originalSettings: {} },
+  true,
+  new Set(),
+);
 
 export const renderWithProviders = (
   component: React.ReactElement,
+  { shellFocus = true, settings = mockSettings } = {},
 ): ReturnType<typeof render> =>
   render(
-    <KeypressProvider kittyProtocolEnabled={true}>
-      {component}
-    </KeypressProvider>,
+    <SettingsContext.Provider value={settings}>
+      <ShellFocusContext.Provider value={shellFocus}>
+        <KeypressProvider kittyProtocolEnabled={true}>
+          {component}
+        </KeypressProvider>
+      </ShellFocusContext.Provider>
+    </SettingsContext.Provider>,
   );