Merge branch 'google-gemini:main' into main

Author: akabarki76

.github/workflows/ci.yml

@@ -10,22 +10,19 @@ on:
   merge_group:
 
 jobs:
-  build:
-    name: Build and Lint
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     permissions:
       contents: read # For checkout
-    strategy:
-      matrix:
-        node-version: [20.x, 22.x, 24.x]
     steps:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - name: Set up Node.js ${{ matrix.node-version }}
+      - name: Set up Node.js
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: '.nvmrc'
           cache: 'npm'
 
       - name: Install dependencies
@@ -45,24 +42,17 @@ jobs:
       - name: Run type check
         run: npm run typecheck
 
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        with:
-          name: build-artifacts-${{ matrix.node-version }}
-          path: |
-            packages/*/dist
-            package-lock.json # Only upload dist and lockfile
   test:
     name: Test
     runs-on: ubuntu-latest
-    needs: build # This job depends on the 'build' job
+    needs: lint
     permissions:
       contents: read
       checks: write
       pull-requests: write
     strategy:
       matrix:
-        node-version: [20.x, 22.x, 24.x] # Should match the build job's matrix
+        node-version: [20.x, 22.x, 24.x]
     steps:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -73,16 +63,8 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
 
-      - name: Download build artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
-        with:
-          name: build-artifacts-${{ matrix.node-version }}
-          path: . # Download to the root, this will include package-lock.json and packages/*/dist
-
-      # Restore/create package structure for dist folders if necessary.
-      # The download-artifact action with path: . should place them correctly if the
-      # upload paths were relative to the workspace root.
-      # Example: if uploaded `packages/cli/dist`, it will be at `./packages/cli/dist`.
+      - name: Build project
+        run: npm run build
 
       - name: Install dependencies for testing
         run: npm ci # Install fresh dependencies using the downloaded package-lock.json
@@ -92,7 +74,7 @@ jobs:
 
       - name: Publish Test Report (for non-forks)
         if: always() && (github.event.pull_request.head.repo.full_name == github.repository)
-        uses: dorny/test-reporter@890a17cecf52a379fc869ab770a71657660be727 # v2
+        uses: dorny/test-reporter@dc3a92680fcc15842eef52e8c4606ea7ce6bd3f3 # v2
         with:
           name: Test Results (Node ${{ matrix.node-version }})
           path: packages/*/junit.xml

.github/workflows/e2e.yml

@@ -14,14 +14,15 @@ jobs:
     strategy:
       matrix:
         sandbox: [sandbox:none, sandbox:docker]
+        node-version: [20.x, 22.x, 24.x]
     steps:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - name: Set up Node.js
+      - name: Set up Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
-          node-version: 20.x
+          node-version: ${{ matrix.node-version }}
           cache: 'npm'
 
       - name: Install dependencies

.nvmrc

@@ -0,0 +1 @@
+20

CONTRIBUTING.md

@@ -210,7 +210,7 @@ npm run lint
 
 - Please adhere to the coding style, patterns, and conventions used throughout the existing codebase.
 - Consult [GEMINI.md](https://github.com/google-gemini/gemini-cli/blob/main/GEMINI.md) (typically found in the project root) for specific instructions related to AI-assisted development, including conventions for React, comments, and Git usage.
-- **Imports:** Pay special attention to import paths. The project uses `eslint-rules/no-relative-cross-package-imports.js` to enforce restrictions on relative imports between packages.
+- **Imports:** Pay special attention to import paths. The project uses ESLint to enforce restrictions on relative imports between packages.
 
 ### Project Structure
 

eslint-rules/no-relative-cross-package-imports.js

@@ -12,7 +12,6 @@ import prettierConfig from 'eslint-config-prettier';
 import importPlugin from 'eslint-plugin-import';
 import globals from 'globals';
 import licenseHeader from 'eslint-plugin-license-header';
-import noRelativeCrossPackageImports from './eslint-rules/no-relative-cross-package-imports.js';
 import path from 'node:path'; // Use node: prefix for built-ins
 import url from 'node:url';
 
@@ -34,7 +33,6 @@ export default tseslint.config(
       'packages/core/dist/**',
       'packages/server/dist/**',
       'packages/vscode-ide-companion/dist/**',
-      'eslint-rules/*',
       'bundle/**',
     ],
   },
@@ -72,6 +70,14 @@ export default tseslint.config(
   {
     // General overrides and rules for the project (TS/TSX files)
     files: ['packages/*/src/**/*.{ts,tsx}'], // Target only TS/TSX in the cli package
+    plugins: {
+      import: importPlugin,
+    },
+    settings: {
+      'import/resolver': {
+        node: true,
+      },
+    },
     languageOptions: {
       globals: {
         ...globals.node,
@@ -106,6 +112,13 @@ export default tseslint.config(
           caughtErrorsIgnorePattern: '^_',
         },
       ],
+      'import/no-internal-modules': [
+        'error',
+        {
+          allow: ['react-dom/test-utils', 'memfs/lib/volume.js', 'yargs/**'],
+        },
+      ],
+      'import/no-relative-packages': 'error',
       'no-cond-assign': 'error',
       'no-debugger': 'error',
       'no-duplicate-case': 'error',
@@ -213,24 +226,4 @@ export default tseslint.config(
       ],
     },
   },
-  // Custom eslint rules for this repo
-  {
-    files: ['packages/**/*.{js,jsx,ts,tsx}'],
-    plugins: {
-      custom: {
-        rules: {
-          'no-relative-cross-package-imports': noRelativeCrossPackageImports,
-        },
-      },
-    },
-    rules: {
-      // Enable and configure your custom rule
-      'custom/no-relative-cross-package-imports': [
-        'error',
-        {
-          root: path.join(projectRoot, 'packages'),
-        },
-      ],
-    },
-  },
 );

eslint.config.js

@@ -37,7 +37,6 @@ import {
   logUserPrompt,
   AuthType,
   getOauthClient,
-  shouldAttemptBrowserLaunch,
 } from '@google/gemini-cli-core';
 import { validateAuthMethod } from './config/auth.js';
 import { setMaxSizedBoxDebugging } from './ui/components/shared/MaxSizedBox.js';
@@ -188,7 +187,7 @@ export async function main() {
 
   if (
     settings.merged.selectedAuthType === AuthType.LOGIN_WITH_GOOGLE &&
-    (config.getNoBrowser() || !shouldAttemptBrowserLaunch())
+    config.isBrowserLaunchSuppressed()
   ) {
     // Do oauth before app renders to make copying the link possible.
     await getOauthClient(settings.merged.selectedAuthType, config);

packages/cli/src/gemini.tsx

@@ -11,7 +11,6 @@ import {
   Config,
   clearCachedCredentialFile,
   getErrorMessage,
-  shouldAttemptBrowserLaunch,
 } from '@google/gemini-cli-core';
 import { runExitCleanup } from '../../utils/cleanup.js';
 
@@ -60,7 +59,7 @@ export const useAuthCommand = (
         settings.setValue(scope, 'selectedAuthType', authType);
         if (
           authType === AuthType.LOGIN_WITH_GOOGLE &&
-          (config.getNoBrowser() || !shouldAttemptBrowserLaunch())
+          config.isBrowserLaunchSuppressed()
         ) {
           runExitCleanup();
           console.log(

packages/cli/src/ui/hooks/useAuthCommand.ts

@@ -38,6 +38,7 @@ vi.mock('../utils/browser.js', () => ({
 const mockConfig = {
   getNoBrowser: () => false,
   getProxy: () => 'http://test.proxy.com:8080',
+  isBrowserLaunchSuppressed: () => false,
 } as unknown as Config;
 
 // Mock fetch globally
@@ -180,6 +181,7 @@ describe('oauth2', () => {
     const mockConfigWithNoBrowser = {
       getNoBrowser: () => true,
       getProxy: () => 'http://test.proxy.com:8080',
+      isBrowserLaunchSuppressed: () => true,
     } as unknown as Config;
 
     const mockCodeVerifier = {